From: Alan Mackenzie <acm@muc.de>
Date: Fri, 28 Oct 2011 14:35:39 +0000 (+0000)
Subject: Boring merge from savannah.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~429
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=93b5b3bdc8b734132c530acd6ffae1196c0865bc;p=emacs.git

Boring merge from savannah.
---

93b5b3bdc8b734132c530acd6ffae1196c0865bc